modules/engines/Makefile.am Decide whether to build the ms-windows theme

2005-06-05  Tor Lillqvist  <tml@novell.com>

	* modules/engines/Makefile.am
	* modules/input/Makefile.am: Decide whether to build the
	ms-windows theme engine based on the GDK backend, not based on
	platform. (I.e., if building for Cygwin with the X11 backend, we
	shouldn't build the ms-windows engine, but if building for Cygwin
	but with the Win32 backend, we should.) Ditto for the IME
	(Windows) input module. (#305832)

diff --git a/ChangeLog b/ChangeLog
index 1b4887eb59aabb6d765acbbe735d2fe48f086cb3..1bc131cabefc0a0abe34a80762dbf59b42cf7b1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-05  Tor Lillqvist  <tml@novell.com>
+
+       * modules/engines/Makefile.am
+       * modules/input/Makefile.am: Decide whether to build the
+       ms-windows theme engine based on the GDK backend, not based on
+       platform. (I.e., if building for Cygwin with the X11 backend, we
+       shouldn't build the ms-windows engine, but if building for Cygwin
+       but with the Win32 backend, we should.) Ditto for the IME
+       (Windows) input module. (#305832)
+
 2005-06-04  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkcursor-win32.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1b4887eb59aabb6d765acbbe735d2fe48f086cb3..1bc131cabefc0a0abe34a80762dbf59b42cf7b1c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2005-06-05  Tor Lillqvist  <tml@novell.com>
+
+       * modules/engines/Makefile.am
+       * modules/input/Makefile.am: Decide whether to build the
+       ms-windows theme engine based on the GDK backend, not based on
+       platform. (I.e., if building for Cygwin with the X11 backend, we
+       shouldn't build the ms-windows engine, but if building for Cygwin
+       but with the Win32 backend, we should.) Ditto for the IME
+       (Windows) input module. (#305832)
+
 2005-06-04  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkcursor-win32.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1b4887eb59aabb6d765acbbe735d2fe48f086cb3..1bc131cabefc0a0abe34a80762dbf59b42cf7b1c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2005-06-05  Tor Lillqvist  <tml@novell.com>
+
+       * modules/engines/Makefile.am
+       * modules/input/Makefile.am: Decide whether to build the
+       ms-windows theme engine based on the GDK backend, not based on
+       platform. (I.e., if building for Cygwin with the X11 backend, we
+       shouldn't build the ms-windows engine, but if building for Cygwin
+       but with the Win32 backend, we should.) Ditto for the IME
+       (Windows) input module. (#305832)
+
 2005-06-04  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkcursor-win32.c

diff --git a/modules/engines/Makefile.am b/modules/engines/Makefile.am
index b82537db6e633c5526917938307134421996e6f1..8eff8c9308f55fc2bc39becc54fc240635c93f00 100644 (file)
--- a/modules/engines/Makefile.am
+++ b/modules/engines/Makefile.am
@@ -1,4 +1,4 @@
-if PLATFORM_WIN32
+if USE_WIN32
 wimp = ms-windows
 endif
 

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 42c6e8997834062d46d50d32235870b72c8d4737..3beb81b696f90ccd83adff7d06ce667454757b56 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -83,7 +83,7 @@ im_ime_la_SOURCES = \
        imime.c           \
        imm-extra.h
 im_ime_la_LIBADD = -limm32 $(LDADDS)
-if PLATFORM_WIN32
+if USE_WIN32
 IM_IME_MODULE=im-ime.la 
 endif